diff --git a/TODO.md b/TODO.md
index 7a23e43..fdf32ba 100755
--- a/TODO.md
+++ b/TODO.md
@@ -1,3 +1,5 @@
+- [ ] add home support for `me@myputer` syntax that would extend the `me` user
+
 ## Next
 - [ ] formalize how the snow flake system compiles outputs, this would remove the need for `mapNodes`
 - [ ] groups should allow you to set node configuration defaults
diff --git a/nix/nixos/remote-deploy/default.nix b/nix/nixos/remote-deploy/default.nix
index 4aa39fd..c47ca0f 100644
--- a/nix/nixos/remote-deploy/default.nix
+++ b/nix/nixos/remote-deploy/default.nix
@@ -9,7 +9,9 @@
   user = node.deploy.ssh.user;
   cfg = config.users.users.${user};
 
-  DEFAULT_USER = "cerubld";
+  # use options and config instead of hardcoding
+  # (the same value is accessible in nix/snow/flake/nodes/node.nix)
+  DEFAULT_USER = "snowbld";
 
   isStandardDeployUser = user == DEFAULT_USER;
 in {
@@ -71,7 +73,7 @@ in {
       group = user;
 
       createHome = true;
-      home = "/var/lib/cerulean/cerubld";
+      home = "/var/lib/cerulean/${user}";
 
       useDefaultShell = false;
       shell = pkgs.bash;