diff --git a/flake.nix b/flake.nix
index 72027b6..e893e4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,8 +73,6 @@
             inputs.devshell.overlay
             inputs.agenix.overlay
             inputs.deploy-rs.overlay
-            # TODO: This causes a compile from source which is pretty unnecessary
-            inputs.nix.overlay
             (flakePackageOverlay inputs.home-manager-unstable system)
           ];
         }))
diff --git a/home-modules/common.nix b/home-modules/common.nix
index b818f7d..e1df5dd 100644
--- a/home-modules/common.nix
+++ b/home-modules/common.nix
@@ -87,7 +87,7 @@ in
       # Note: If globalPkgs mode is on, then these will be overridden by the NixOS equivalents of these options
       nixpkgs = {
         overlays = [
-          inputs.nix.overlay
+          (final: prev: { nix = inputs.nix.defaultPackage.${config.nixpkgs.system}; })
           # TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable
           (final: prev: { remarshal = pkgs'.master.remarshal; })
         ];
diff --git a/modules/common.nix b/modules/common.nix
index d43c75b..edbca8b 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -62,7 +62,7 @@ in
       };
       nixpkgs = {
         overlays = [
-          inputs.nix.overlay
+          (final: prev: { nix = inputs.nix.defaultPackage.${config.nixpkgs.system}; })
         ];
         config = {
           allowUnfree = true;