diff --git a/flake.nix b/flake.nix
index 3158cd7a..60d890bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -192,18 +192,19 @@
       nixosConfigurations = let
         nixosSystem' =
           # Our custom NixOS builder
-          { nixpkgs ? inputs.nixpkgs, extraArgs ? {}, ... }@args:
-          nixpkgs.lib.nixosSystem (nixpkgs.lib.filterAttrs (n: _: n != "nixpkgs") args // {
-            extraArgs = extraArgs // {
-              inherit hostRegistry inputs zentralwerk;
-            };
-            extraModules = [
+          { nixpkgs ? inputs.nixpkgs, modules, extraArgs ? {}, system }:
+          nixpkgs.lib.nixosSystem {
+            inherit system;
+            modules = modules ++ [
               self.nixosModules.c3d2
               ({ pkgs, ... }: {
+                _module.args = extraArgs // {
+                  inherit hostRegistry inputs zentralwerk;
+                };
                 nixpkgs.overlays = [ self.overlay ];
               })
             ];
-          });
+          };
       in {
 
         freifunk = nixosSystem' {