diff --git a/flake.nix b/flake.nix
index df3da67..0ea3f04 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,7 +93,7 @@
           hostName = "nixos";
         };
 
-        "pitagoras" = mkHomeConfig {
+        "${baseUserConfig.username}@pitagoras" = mkHomeConfig {
           isNixOS = true;
           overrides = {
             mainMonitor = "eDP-1";
@@ -101,7 +101,7 @@
           hostName = "pitagoras";
         };
 
-        "pilecki" = mkHomeConfig {
+        "${baseUserConfig.username}@pilecki" = mkHomeConfig {
           isNixOS = true;
           overrides = {
             mainMonitor = "LVDS-1";
@@ -109,7 +109,7 @@
           hostName = "pilecki";
         };
 
-        "paderewski" = mkHomeConfig {
+        "${baseUserConfig.username}@paderewski" = mkHomeConfig {
           isNixOS = false;
           overrides = {
             mainMonitor = "DP-1";
@@ -117,7 +117,7 @@
           hostName = "paderewski";
         };
 
-        "paderewski-nix" = mkHomeConfig {
+        "${baseUserConfig.username}@paderewski-nix" = mkHomeConfig {
           isNixOS = true;
           overrides = {
             mainMonitor = "DP-1";
diff --git a/modules/cli/fish.nix b/modules/cli/fish.nix
index fb4d3f4..5fe6e9b 100644
--- a/modules/cli/fish.nix
+++ b/modules/cli/fish.nix
@@ -61,7 +61,12 @@
 
       reload_dotfiles = {
         body = # fish
-          "nh home switch ~/.config/home-manager -c ${hostName}";
+          "nh home switch ~/.config/home-manager";
+      };
+
+      reload_system = {
+        body = # fish
+          "nh os switch /etc/nixos/";
       };
 
       ls = {