diff --git a/flake.nix b/flake.nix
index 092ce1c..3290112 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,11 +54,11 @@
                 ( set -x; ${nix} ${nixOptions} copy ${flake} --to ssh://${user}@${host} )
               '' + (if hermetic then ''
                 echo "🤞 Activating configuration hermetically on ${machine} via ssh:"
-                ( set -x; ${nix} ${nixOptions} copy --derivation ${nixos-rebuild} --to ssh://${user}@${host} )
-                ( set -x; ${openssh} -t ${user}@${host} "sudo ${flock} -w 60 /dev/shm/nixinate-${machine} nix-store --realise ${nixos-rebuild} && sudo ${nixos-rebuild} ${nixOptions} ${switch} --flake ${flake}#${machine}" )
+                ( set -x; ${nix} ${nixOptions} copy --derivation ${nixos-rebuild} ${flock} --to ssh://${user}@${host} )
+                ( set -x; ${openssh} -t ${user}@${host} "sudo nix-store --realise ${nixos-rebuild} ${flock} && sudo ${flock} -w 60 /dev/shm/nixinate-${machine} ${nixos-rebuild} ${nixOptions} ${switch} --flake ${flake}#${machine}" )
               '' else ''
                 echo "🤞 Activating configuration non-hermetically on ${machine} via ssh:"
-                ( set -x; ${openssh} -t ${user}@${host} "sudo ${flock} -w 60 /dev/shm/nixinate-${machine} nixos-rebuild ${switch} --flake ${flake}#${machine}" )
+                ( set -x; ${openssh} -t ${user}@${host} "sudo flock -w 60 /dev/shm/nixinate-${machine} nixos-rebuild ${switch} --flake ${flake}#${machine}" )
               '')
               else ''
                 echo "🔨 Building system closure locally, copying it to remote store and activating it:"
diff --git a/tests/vmTest/default.nix b/tests/vmTest/default.nix
index 097d4fa..1eb70b8 100644
--- a/tests/vmTest/default.nix
+++ b/tests/vmTest/default.nix
@@ -70,7 +70,8 @@ let
             writableStore = true;
             additionalPaths = []
               ++ lib.optional (buildOn == "remote") (allDrvOutputs exampleSystem)
-              ++ lib.optional (hermetic == true) (pkgs.nixinate.nixos-rebuild);
+              ++ lib.optional (hermetic == true) (pkgs.nixinate.nixos-rebuild.drvPath)
+              ++ lib.optional (hermetic == true) (pkgs.flock.drvPath);
           };
         };
         nixinator = { ... }: {
@@ -81,7 +82,8 @@ let
             additionalPaths = [
               (allDrvOutputs exampleSystem)
             ]
-              ++ lib.optional (buildOn == "remote") exampleFlake;
+              ++ lib.optional (buildOn == "remote") exampleFlake
+              ++ lib.optional (hermetic == true) pkgs.flock.drvPath;
           };
         };
       };