diff --git a/flake.lock b/flake.lock
index f94bcae..41b1b24 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711588700,
-        "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
+        "lastModified": 1711934712,
+        "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
+        "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711868868,
-        "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=",
+        "lastModified": 1711915616,
+        "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab",
+        "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6",
         "type": "github"
       },
       "original": {
diff --git a/system/utilities/samba.nix b/system/utilities/samba.nix
index da83a07..c8f722a 100644
--- a/system/utilities/samba.nix
+++ b/system/utilities/samba.nix
@@ -9,16 +9,14 @@
   fileSystems."/mnt/fileserver" = {
     device = "//192.168.12.5/fileserver";
     fsType = "cifs";
-    options = let
+    options =
+    let
       # this line prevents hanging on network split
       automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-
-    in [
-      "${automount_opts},
-      credentials=/etc/nixos/smb-secrets,
-      ${config.users.users.${userSettings.username}.uid},
-      gid=${config.users.groups.${userSettings.username}.gid}"
-    ];
+      username = userSettings.username;
+      uid = config.users.users.${username}.uid;
+      gid = config.users.groups.${username}.gid;
+    in [ "${automount_opts},credentials=/etc/nixos/smb-secrets,uid=${toString uid},gid=${toString gid}" ];
     # Make sure to create `/etc/nixos/smb-secrets` with following content
     # where domain can be optional
     # username=<USERNAME>