diff --git a/Makefile b/Makefile
index 496f72e..7717002 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,15 @@ machine:
 	@echo "${HOSTNAME}"
 
 switch:
-	nixos-rebuild switch --flake ".#${HOSTNAME}" --use-remote-sudo
+	nh os switch -a -H "${HOSTNAME}" . 
 
 test:
-	nixos-rebuild test --flake ".#${HOSTNAME}" --use-remote-sudo
+	nh os test -a -H "${HOSTNAME}" .
 
-upgrade:
+update:
 	sudo nix flake update
-	nixos-rebuild switch --flake ".#${HOSTNAME}" --use-remote-sudo
+
+upgrade: update switch
 
 clean:
 	sudo nix-collect-garbage -d
diff --git a/flake.lock b/flake.lock
index b2a79e4..ccc89e6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -222,11 +222,11 @@
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
-        "lastModified": 1746485010,
-        "narHash": "sha256-KK1prO/dQ0HY17YseXI+udT/WbK4s6YdR2YXJE9kGTU=",
+        "lastModified": 1746536883,
+        "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "53084257189483605182aaf388696ace02f5d208",
+        "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0",
         "type": "github"
       },
       "original": {
diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix
index c444e62..76b29a5 100644
--- a/modules/nix-config/default.nix
+++ b/modules/nix-config/default.nix
@@ -4,14 +4,6 @@
 		./fonts.nix
 	];
 
-	nix.gc = {
-		automatic = true;
-		dates = "weekly";
-		options = "--delete-older-than 1w";
-	};
-
-	nix.optimise.automatic = true;
-
 	time.timeZone = "Europe/Rome";
 
 	# Select internationalisation properties.
diff --git a/modules/packages.nix b/modules/packages.nix
index e2efe23..16f8632 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -62,4 +62,9 @@
 		enable = true;
 		remotePlay.openFirewall = true;
 	} else {};
+
+	programs.nh = {
+		enable = true;
+		clean.enable = true;
+	};
 }