diff --git a/liminix-hive.nix b/liminix-hive.nix
index 94c65de..a9be921 100644
--- a/liminix-hive.nix
+++ b/liminix-hive.nix
@@ -6,24 +6,18 @@
 }:
 let
   evalLiminix =
+    { config, device }:
     {
-      config,
-      device,
-      output,
-    }:
-    {
-      primary =
-        (import liminix {
-          inherit device nixpkgs;
-          imageType = "primary";
-          liminix-config = config;
-        }).outputs.${output};
-      secondary =
-        (import liminix {
-          inherit device nixpkgs;
-          imageType = "secondary";
-          liminix-config = config;
-        }).outputs.${output};
+      primary = import liminix {
+        inherit device nixpkgs;
+        imageType = "primary";
+        liminix-config = config;
+      };
+      secondary = import liminix {
+        inherit device nixpkgs;
+        imageType = "secondary";
+        liminix-config = config;
+      };
     };
   zyxel = {
     nwa50ax = import "${liminix}/devices/zyxel-nwa50ax";
@@ -40,6 +34,5 @@ in
   ap-test = evalLiminix {
     config = ./machines/ap/configuration.nix;
     device = zyxel.nwa50ax;
-    output = "zyxel-nwa-fit";
   };
 }
diff --git a/liminix-rebuild.nix b/liminix-rebuild.nix
new file mode 100644
index 0000000..1bca642
--- /dev/null
+++ b/liminix-rebuild.nix
@@ -0,0 +1 @@
+{ liminix-system }: (import ./liminix-hive.nix { }).${liminix-system}.primary