diff --git a/effects/flake-update/test-module-eval.nix b/effects/flake-update/test-module-eval.nix
index 365ee30..e1e267a 100644
--- a/effects/flake-update/test-module-eval.nix
+++ b/effects/flake-update/test-module-eval.nix
@@ -70,10 +70,10 @@ rec {
     assert basicUpdateHerculesCI.onSchedule.flake-update.when ==
       { dayOfMonth = null; dayOfWeek = null; hour = [ 23 ]; minute = 59; };
 
-    assert contains "cd 'subflake'" subflakeUpdateConfig.git.update.script;
+    assert contains "cd subflake" subflakeUpdateConfig.git.update.script;
     # The default (flake at root) is overridden by the user definition. Potentially not future proof because it could match some other './.' substring.
-    assert ! contains "cd '.'" subflakeUpdateConfig.git.update.script;
-    assert contains "cd '.'" basicUpdateConfig.git.update.script;
+    assert ! contains "cd ." subflakeUpdateConfig.git.update.script;
+    assert contains "cd ." basicUpdateConfig.git.update.script;
 
     assert contains "--update-input nixpkgs" subflakeUpdateConfig.git.update.script;
 
diff --git a/effects/nixops2/test/default.nix b/effects/nixops2/test/default.nix
index 444fc10..c73c300 100644
--- a/effects/nixops2/test/default.nix
+++ b/effects/nixops2/test/default.nix
@@ -76,7 +76,7 @@ let
       ps.nixops-hercules-ci
       ps.nixops-aws
     ]);
-    nix = pkgs.nixUnstable;
+    nix = pkgs.nix;
 
     # Override dynamic options for CI
     prebuildOnlyNetworkFiles = [
diff --git a/effects/nixops2/test/flake.lock b/effects/nixops2/test/flake.lock
index 2de7350..cdc5e1d 100644
--- a/effects/nixops2/test/flake.lock
+++ b/effects/nixops2/test/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709336216,
-        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
+        "lastModified": 1719877454,
+        "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
+        "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1713898310,
-        "narHash": "sha256-VKRHJvjnRg47Fffwm3MMf4ceIJgyHgQrpTupBKm7Bb0=",
+        "lastModified": 1723736589,
+        "narHash": "sha256-/Vdg5ZKtP71ZEKVV6JXlrOEu0CM2Flcs+nwDmWRzgjQ=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-agent",
-        "rev": "2b3bb5f74cba47a7cc18df71474e66de683002ae",
+        "rev": "c303cc8e437c0fd26b9452472e7df5aa374e9177",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709961763,
-        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+        "lastModified": 1719848872,
+        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1713714899,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {
diff --git a/flake-dev.nix b/flake-dev.nix
index f99b093..e0a4261 100644
--- a/flake-dev.nix
+++ b/flake-dev.nix
@@ -105,7 +105,7 @@ top@{ withSystem, lib, inputs, config, self, ... }: {
     in {
       flake-update = hci-effects.callPackage ./effects/flake-update/test.nix { };
       # TODO after https://github.com/NixOS/nix/issues/7730, use nix master
-      flake-update-nix-unstable = hci-effects.callPackage ./effects/flake-update/test.nix { nix = pkgs.nixVersions.unstable; };
+      flake-update-nix-git = hci-effects.callPackage ./effects/flake-update/test.nix { nix = pkgs.nixVersions.git; };
       git-update = hci-effects.callPackage ./effects/modules/git-update/test.nix { };
       write-branch = hci-effects.callPackage ./effects/write-branch/test.nix { };
       # Nix is broken: https://github.com/NixOS/nix/issues/9146
diff --git a/flake.lock b/flake.lock
index bf565c5..8472b16 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -21,11 +21,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713714899,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {