diff --git a/flake.nix b/flake.nix
index 8719c74..faa4564 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,11 +53,6 @@
         home-manager.users.alarsyo = import ./home;
         home-manager.verbose = true;
       };
-      nix-path = {
-        nix.nixPath = [
-          "nixpkgs=${inputs.nixpkgs}"
-        ];
-      };
     };
 
     nixosConfigurations =
@@ -74,10 +69,6 @@
             };
           })
         ];
-        sharedModules = [
-          home-manager.nixosModule
-          { nixpkgs.overlays = shared_overlays; }
-        ] ++ (nixpkgs.lib.attrValues self.nixosModules);
       in {
 
         poseidon = nixpkgs.lib.nixosSystem rec {
@@ -85,6 +76,9 @@
           modules = [
             ./poseidon.nix
 
+            home-manager.nixosModule
+            self.nixosModules.home
+
             {
               nixpkgs.overlays = [
                 (self: super: {
@@ -99,9 +93,9 @@
                     python3 = self.fastPython3;
                   };
                 })
-              ];
+              ] ++ shared_overlays;
             }
-          ] ++ sharedModules;
+          ];
         };
 
         boreal = nixpkgs.lib.nixosSystem rec {
@@ -109,6 +103,9 @@
           modules = [
             ./boreal.nix
 
+            home-manager.nixosModule
+            self.nixosModules.home
+
             {
               nixpkgs.overlays = [
                 inputs.emacs-overlay.overlay
@@ -119,9 +116,9 @@
                 # (self: super: {
                 #   stdenv = super.impureUseNativeOptimizations super.stdenv;
                 # })
-              ];
+              ] ++ shared_overlays;
             }
-          ] ++ sharedModules;
+          ];
         };
 
         zephyrus = nixpkgs.lib.nixosSystem rec {
@@ -133,12 +130,15 @@
             inputs.nixos-hardware.nixosModules.common-pc-laptop
             inputs.nixos-hardware.nixosModules.common-pc-ssd
 
+            home-manager.nixosModule
+            self.nixosModules.home
+
             {
               nixpkgs.overlays = [
                 inputs.emacs-overlay.overlay
-              ];
+              ] ++ shared_overlays;
             }
-          ] ++ sharedModules;
+          ];
         };
 
       };