diff --git a/flake.lock b/flake.lock
index fdc8f6c..d46faff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -63,11 +63,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713946171,
-        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
+        "lastModified": 1715901937,
+        "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
+        "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8",
         "type": "github"
       },
       "original": {
@@ -335,11 +335,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715417624,
-        "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=",
+        "lastModified": 1715845522,
+        "narHash": "sha256-zKv1tlYvIrboMrXo0RD8PZsAAUHB2cKD/BpA31LsPRI=",
         "owner": "jovian-experiments",
         "repo": "jovian-nixos",
-        "rev": "8fef078acb3206be58ae5892a32d6ed75b695647",
+        "rev": "6aa9ba0cda3a3b2e3ce503d67c55d7d6eaf89e6f",
         "type": "github"
       },
       "original": {
@@ -380,11 +380,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1715485879,
-        "narHash": "sha256-a+sGR5aW4K9qF6EALPSOsui8EZF80yBKofWrSE7IZ/Q=",
-        "rev": "4b35e6a75e35e0f79bdadfd5e0d44bc870dcc135",
+        "lastModified": 1715904638,
+        "narHash": "sha256-ByhCkO4mcKtr0XRq8qgkyQnXsAhLZsTWayIEzWHokz0=",
+        "rev": "5756be19f65f125276e6f36ec6e624b06001bc70",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4b35e6a75e35e0f79bdadfd5e0d44bc870dcc135.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/5756be19f65f125276e6f36ec6e624b06001bc70.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -405,11 +405,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715442723,
-        "narHash": "sha256-pXMH7lqr5bT2FjH/3tEdTT/+1+hKx+15WkcGKycWWSM=",
-        "rev": "87b7b7e4bd936301b139e472589d1966b136f45f",
+        "lastModified": 1715885250,
+        "narHash": "sha256-IUFYAl3158Ig5vySnRBHoPReb2/S97bjodCo6FhzJv4=",
+        "rev": "53d713eb486f21d653af3ef3528e9a19ecfc45e5",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/87b7b7e4bd936301b139e472589d1966b136f45f.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/53d713eb486f21d653af3ef3528e9a19ecfc45e5.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -438,11 +438,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1715148395,
-        "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
+        "lastModified": 1715881912,
+        "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
+        "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
         "type": "github"
       },
       "original": {
@@ -453,11 +453,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715534503,
-        "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
+        "lastModified": 1715867414,
+        "narHash": "sha256-cu4UEffKkBByyGR6CFs9XP6iSNsKTkq1r66DA5BkYnE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
+        "rev": "bf446f08bff6814b569265bef8374cfdd3d8f0e0",
         "type": "github"
       },
       "original": {
diff --git a/sets/base.nix b/sets/base.nix
index cdd4756..5c8004a 100644
--- a/sets/base.nix
+++ b/sets/base.nix
@@ -86,6 +86,8 @@
   environment.shellAliases.cp = "cp --reflink=auto --sparse=always";
   networking.firewall.enable = false;
 
+  programs.fish.enable = true;
+
   users = {
     users.artemis = {
       isNormalUser = true;
@@ -95,6 +97,7 @@
         "wheel"
         "artemis"
       ];
+      shell = "/run/current-system/sw/bin/fish";
       # hashedPassword set in private
     };
     groups.artemis.gid = config.users.users.artemis.uid;
diff --git a/sets/xonsh.nix b/sets/xonsh.nix
index bde8ab8..fcb734d 100644
--- a/sets/xonsh.nix
+++ b/sets/xonsh.nix
@@ -24,11 +24,6 @@ let
     };
 in
 {
-  # We need fish for fish completions
-  programs.fish.enable = true;
-
-  users.users.artemis.shell = "/run/current-system/sw/bin/xonsh";
-
   programs.xonsh = {
     enable = true;
     config = ''