diff --git a/flake.nix b/flake.nix
index ebec481..0641e75 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,68 +27,78 @@
 	      home-manager,
 	      ... }: {
     nixosConfigurations = {
-      galvatron = nixpkgs.lib.nixosSystem {
-	system = "aarch64-linux";
-	# specialArgs = { inherit nixpkgs-unstable; };
-        modules = [
-	  ./configuration.nix {
-  	    # nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
-	    hardware.asahi = {
-	      peripheralFirmwareDirectory = ./galvatron/firmware;
-              # useExperimentalGPUDriver = true;
-	      # experimentalGPUInstallMode = "driver";
-	      # experimentalGPUInstallMode = "overlay";
-	    };
-	    boot.loader.efi.canTouchEfiVariables = false;
-	    networking.hostName = "galvatron";
-	    sound.enable = false;
-	  }
-	  ./galvatron/hardware-configuration.nix
-          inputs.apple-silicon.nixosModules.apple-silicon-support
-          home-manager.nixosModules.home-manager
-          {
-	    home-manager.useGlobalPkgs = true;
-	    home-manager.useUserPackages = true;
-	    home-manager.users.mir = import ./home.nix;
-          }
-        ];
-      };
-      starscream = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./configuration.nix {
-            networking.hostName = "starscream";
-	    boot.loader.efi.canTouchEfiVariables = true;
-	    sound.enable = true;
-          }
-          ./hardware/starscream-hw.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.mir = import ./home.nix;
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
-          }
-        ];
-      };
-      knockout = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./configuration.nix {
-            networking.hostName = "knockout";
-	    boot.loader.efi.canTouchEfiVariables = true;
-	    sound.enable = true;
-          }
-          ./hardware/knockout-hw.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.mir = import ./home.nix;
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
-          }
-        ];
-      };
+      galvatron =
+	let 
+	  system = "aarch64-linux";
+	  # specialArgs = { inherit nixpkgs-unstable; };
+	  specialArgs = { inherit inputs; };
+	  modules = [
+	    ./configuration.nix {
+	      # nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
+	      hardware.asahi = {
+	        peripheralFirmwareDirectory = ./galvatron/firmware;
+	        # useExperimentalGPUDriver = true;
+	        # experimentalGPUInstallMode = "driver";
+	        # experimentalGPUInstallMode = "overlay";
+	      };
+	      boot.loader.efi.canTouchEfiVariables = false;
+	      networking.hostName = "galvatron";
+	      sound.enable = false;
+	    }
+	    ./galvatron/hardware-configuration.nix
+	    inputs.apple-silicon.nixosModules.apple-silicon-support
+	    home-manager.nixosModules.home-manager
+	    {
+	      home-manager.useGlobalPkgs = true;
+	      home-manager.useUserPackages = true;
+	      home-manager.users.mir = import ./home.nix;
+	    }
+	  ]; # end of modules
+	in
+	nixpkgs.lib.nixosSystem {inherit system modules specialArgs; };
+      starscream =
+	let 
+          system = "x86_64-linux";
+	  specialArgs = { inherit inputs; };
+          modules = [
+            ./configuration.nix {
+              networking.hostName = "starscream";
+	      boot.loader.efi.canTouchEfiVariables = true;
+	      sound.enable = true;
+            }
+            ./hardware/starscream-hw.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.mir = import ./home.nix;
+              # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
+            }
+          ]; # end of modules
+	in
+	nixpkgs.lib.nixosSystem {inherit system modules specialArgs; };
+      knockout =
+	let
+          system = "x86_64-linux";
+	  specialArgs = { inherit inputs; };
+          modules = [
+            ./configuration.nix {
+              networking.hostName = "knockout";
+	      boot.loader.efi.canTouchEfiVariables = true;
+	      sound.enable = true;
+            }
+            ./hardware/knockout-hw.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.mir = import ./home.nix;
+	      home-manager.extraSpecialArgs = specialArgs;
+              # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
+            }
+          ]; # end of modules
+	in
+	nixpkgs.lib.nixosSystem {inherit system modules specialArgs; };
     };
   };
 }