diff --git a/.gitignore b/.gitignore
index f9ddc726..61a9e2b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 
 # Generated by nix
 result*
+!results/
 .nixd.json
 
 ## AGS
diff --git a/devices/servivi/modules/binary-cache.nix b/devices/servivi/modules/binary-cache.nix
index 484d0264..8d5a8a0b 100644
--- a/devices/servivi/modules/binary-cache.nix
+++ b/devices/servivi/modules/binary-cache.nix
@@ -6,6 +6,7 @@
   pkgs,
   ...
 }: let
+  # FIXME: move nix-fast-build-pkg to overlays, make #nixFastChecks an attrset of all, packages, devices and aptDevices. add binary cache at apartment
   inherit (config.sops) secrets;
 
   nix-fast-build-pkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
@@ -32,16 +33,13 @@
     };
 
     text = ''
-      cd "$FLAKE" || return
+      cd "$FLAKE/results" || return
 
       # Home-assistant sometimes fails some tests when built with everything else
       nom build --no-link \
-        .#nixosConfigurations.homie.config.services.home-assistant.package
+        ..#nixosConfigurations.homie.config.services.home-assistant.package
 
-      nix-fast-build -f .#nixFastChecks "$@"
-
-      mkdir -p results
-      mv -f result-* results
+      nix-fast-build -f ..#nixFastChecks "$@"
     '';
   };
 in {
diff --git a/nixosModules/base/common-nix/default.nix b/nixosModules/base/common-nix/default.nix
index 664541da..a3ddeacd 100644
--- a/nixosModules/base/common-nix/default.nix
+++ b/nixosModules/base/common-nix/default.nix
@@ -13,6 +13,7 @@ self: {
 in {
   config = mkIf cfg.enable {
     nix = {
+      # FIXME: infinite recursion if not set
       package = let
         nixdInput =
           findFirst
diff --git a/results/.gitkeep b/results/.gitkeep
new file mode 100644
index 00000000..e69de29b