diff --git a/flake.nix b/flake.nix
index 126738a..b9a72b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,40 +29,5 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, nixos-hardware, nur, niri, ... }: {
-    nixosConfigurations = let
-      commonModules = [
-          ./modules/system
-
-          niri.nixosModules.default
-
-          home-manager.nixosModules.home-manager {
-            nixpkgs.overlays = [
-              nur.overlay
-            ];
-
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.twoneis = import ./modules/home;
-            };
-          }
-      ];
-    in {
-      desktop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./devices/desktop
-        ] ++ commonModules;
-      };
-
-      surface = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./devices/surface
-          nixos-hardware.nixosModules.microsoft-surface-pro-intel
-        ] ++ commonModules;
-      };
-    };
-  };
+  outputs = inputs: import ./outputs.nix inputs;
 }
diff --git a/outputs.nix b/outputs.nix
new file mode 100644
index 0000000..29b152a
--- /dev/null
+++ b/outputs.nix
@@ -0,0 +1,33 @@
+{ nixpkgs, home-manager, nixos-hardware, nur, niri, ... }@inputs: {
+  nixosConfigurations = let
+    commonModules = [
+        ./modules/system
+        niri.nixosModules.default
+        home-manager.nixosModules.home-manager {
+          nixpkgs.overlays = [
+            nur.overlay
+          ];
+          home-manager = {
+            useGlobalPkgs = true;
+            useUserPackages = true;
+            users.twoneis = import ./modules/home;
+          };
+        }
+    ];
+  in {
+    desktop = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./devices/desktop
+      ] ++ commonModules;
+    };
+
+    surface = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        ./devices/surface
+        nixos-hardware.nixosModules.microsoft-surface-pro-intel
+      ] ++ commonModules;
+    };
+  };
+}