diff --git a/flake.nix b/flake.nix
index 816bb15..56103b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,7 +72,7 @@
     pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
   in {
     nixosConfigurations = rec {
-      nixy = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
@@ -87,7 +87,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs;};
+            home-manager.extraSpecialArgs = {inherit inputs system;};
           }
           peerix.nixosModules.peerix
           {
@@ -104,7 +104,7 @@
         ];
       };
 
-      mediabox = nixpkgs.lib.nixosSystem {
+      mediabox = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
@@ -120,7 +120,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs;};
+            home-manager.extraSpecialArgs = {inherit inputs system;};
           }
           peerix.nixosModules.peerix
           {
@@ -137,7 +137,7 @@
         ];
       };
 
-      blue = nixpkgs.lib.nixosSystem {
+      blue = nixpkgs.lib.nixosSystem rec {
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
@@ -150,17 +150,18 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.akill = import ./home/home.nix;
+            home-manager.extraSpecialArgs = {inherit inputs system;};
           }
         ];
       };
-      magpie = nixpkgs.lib.nixosSystem {
+      magpie = nixpkgs.lib.nixosSystem rec {
         system = "arm64-linux";
         modules = [
           {_module.args = inputs;}
           {nix.registry.nixpkgs.flake = nixpkgs;}
           ./magpie/configuration.nix
           ./magpie/hardware-configuration.nix
-	  goatcounter.nixosModules.goatcounter
+          goatcounter.nixosModules.goatcounter
           simple-nixos-mailserver.nixosModule
           sops-nix.nixosModules.sops
           (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")