diff --git a/baseconfiguration.nix b/baseconfiguration.nix
index 4cbbecc..8de4f59 100644
--- a/baseconfiguration.nix
+++ b/baseconfiguration.nix
@@ -47,8 +47,6 @@
       dates = "weekly";
       options = "--delete-older-than 30d";
     };
-    nixPath = [ "nixpkgs=${pkgs}" ];
-    registry.nixpkgs.flake = pkgs;
   };
   nixpkgs = {
     overlays = [ flakes.emacs-overlay.overlay flakeOutputs.overlay ] ++ extraOverlays;
diff --git a/default.nix b/default.nix
index db563c9..81bee9f 100644
--- a/default.nix
+++ b/default.nix
@@ -21,7 +21,11 @@ let
           inherit system;
           modules = [
             configuration
-            { nix.package = pkgs.legacyPackages.${system}.nixUnstable; }
+            { nix = {
+                package = pkgs.legacyPackages.${system}.nixUnstable;
+                nixPath= [ "nixpkgs=${pkgs}" ];
+                registry.nixpkgs.flake = pkgs;}
+              ;}
           ] ++ extraModules
           ++ flakes.nixpkgs.lib.mapAttrsToList (_: module: module)
             flakeOutputs.nixosModules;