diff --git a/local/lock/flake.lock b/local/lock/flake.lock
index 20a3b85..f09bed3 100644
--- a/local/lock/flake.lock
+++ b/local/lock/flake.lock
@@ -1182,11 +1182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718293768,
-        "narHash": "sha256-Iskt7ZswuwBs4xE0CdOfNaxgL0k39W6gVjqtZprJB6o=",
+        "lastModified": 1719948270,
+        "narHash": "sha256-E9K1D8jZTV3+hvAMQKjgUwReEIMV9LRYiW1B2Bd3nEk=",
         "owner": "tweag",
         "repo": "nickel",
-        "rev": "d8cdd772aa4b9efb5a4711bcd3f042b214b605ce",
+        "rev": "32a4b675a4f300b45f4bbb0975f4f64e0af7a9b6",
         "type": "github"
       },
       "original": {
diff --git a/src/mkHome.nix b/src/mkHome.nix
index fe72594..fbe2921 100644
--- a/src/mkHome.nix
+++ b/src/mkHome.nix
@@ -40,8 +40,9 @@ in
                     suites
                     { programs.${shell}.enable = true; }
                   ];
-                  home.stateVersion =
-                    if pkgs.stdenv.isDarwin then pkgs.lib.trivial.release else "24.05";
+                  home.stateVersion = lib.mkDefault (
+                    if pkgs.stdenv.isDarwin then pkgs.lib.trivial.release else "24.05"
+                  );
                 };
                 users.users.${userName} = {
                   shell = pkgs."${shell}";
diff --git a/units/nixos/darwinProfiles/presets/nix/default.nix b/units/nixos/darwinProfiles/presets/nix/default.nix
index f9c8aca..1aa4d67 100644
--- a/units/nixos/darwinProfiles/presets/nix/default.nix
+++ b/units/nixos/darwinProfiles/presets/nix/default.nix
@@ -15,7 +15,7 @@ in
 {
   imports = [ (loadSubmodule ./optimise.nix) ];
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixVersions.git;
     configureBuildUsers = true;
     settings = {
       # Administrative users on Darwin systems are part of the admin group.
diff --git a/units/nixos/nixosProfiles/presets/coding/nickel.nix b/units/nixos/nixosProfiles/presets/coding/nickel.nix
index d1b034b..6792e28 100644
--- a/units/nixos/nixosProfiles/presets/coding/nickel.nix
+++ b/units/nixos/nixosProfiles/presets/coding/nickel.nix
@@ -24,6 +24,6 @@ in
   environment.systemPackages =
     [ (nickel.packages.${pkgs.system}.default or inputs.nickel.default) ]
     ++ lib.optionals cfg.enableLsp [
-      (nickel.packages.${pkgs.system}.lsp-nls or inputs.nickel.lsp-nls)
+      (nickel.packages.${pkgs.system}.nickel-lang-lsp)
     ];
 }
diff --git a/units/nixos/nixosProfiles/presets/node.nix b/units/nixos/nixosProfiles/presets/coding/node.nix
similarity index 100%
rename from units/nixos/nixosProfiles/presets/node.nix
rename to units/nixos/nixosProfiles/presets/coding/node.nix