diff --git a/.gitmodules b/.gitmodules
index b196e3d1..8fb1d86a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,4 @@
 [submodule ".nixos"]
 	path = .nixos
 	url = https://github.com/voidarclabs/nix
+	branch = main
diff --git a/doot/config.toml b/doot/config.toml
index 1d33de3e..42bee671 100644
--- a/doot/config.toml
+++ b/doot/config.toml
@@ -34,5 +34,5 @@ diff_command = "diff --unified --color=always"
 # In the example below, <dotfiles dir>/laptop-dots/.zshrc will be symlinked to ~/.zshrc, taking precedence over <dotfiles dir>/.zshrc, if and only if the hostname is "my-laptop".
 # If `implicit_dot` is set to true, the host-specific directories also count as top-level. For example, <dotfiles dir>/laptop-dots/config/foo will be symlinked as ~/.config/foo.
 [hosts]
-"hackstation" = "pc-files"
-"laptop" = "laptop-files"
+"HACKSTATION" = "pc-files"
+"mobile02" = "laptop-files"
diff --git a/laptop-files/.zshrc-local b/laptop-files/.zshrc-local
index b4b8ccab..d90eda72 100644
--- a/laptop-files/.zshrc-local
+++ b/laptop-files/.zshrc-local
@@ -1,3 +1,3 @@
 # Just for Laptop
 alias vinix="nvim ~/.nixos/configuration-laptop.nix"
-alias nrs="sudo nixos-rebuild switch --impure --flake ~/.nixos#mobile02"
+alias nrs="sudo nixos-rebuild switch --impure --flake $(dirname $(readlink -f ~/.dotfiles/.nixos/flake.nix))#mobile02"
diff --git a/pc-files/.zshrc-local b/pc-files/.zshrc-local
index 3792a176..ef275f1d 100644
--- a/pc-files/.zshrc-local
+++ b/pc-files/.zshrc-local
@@ -1,3 +1,3 @@
 # Just for Hackstation
 alias vinix="nvim ~/.nixos/configuration-pc.nix"
-alias nrs="sudo nixos-rebuild switch --impure --flake ~/.nixos#hackstation"
+alias nrs="sudo nixos-rebuild switch --impure --flake $(dirname $(readlink -f ~/.dotfiles/.nixos/flake.nix))#hackstation"