diff --git a/scripts/update-home b/scripts/update-home
index 71d853a..a17b0c9 100755
--- a/scripts/update-home
+++ b/scripts/update-home
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 cd "$(dirname ${BASH_SOURCE[0]})/.."
-
-home-manager switch -f ./users/minion/home.nix
+nix build .#homeManagerConfigurations.minion.activationPackage
+./result/activate
+scripts/commit home
diff --git a/scripts/update-nix b/scripts/update-nix
index 7ea7705..9b7111d 100755
--- a/scripts/update-nix
+++ b/scripts/update-nix
@@ -2,4 +2,5 @@
 
 cd "$(dirname ${BASH_SOURCE[0]})/.."
 
-sudo nixos-rebuild switch -I nixos-config=./system/configuration.nix
+sudo nixos-rebuild switch --flake .#
+scripts/commit system
diff --git a/scripts/upgrade-home b/scripts/upgrade-home
index 2b74d7e..0f5cd27 100755
--- a/scripts/upgrade-home
+++ b/scripts/upgrade-home
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd "$(dirname ${BASH_SOURCE[0]})/.."
-nix-channel --update
-home-manager switch -f ./users/minion/home.nix
+nix flake update
+scripts/update-home
diff --git a/scripts/upgrade-nix b/scripts/upgrade-nix
index ff73187..51ae11e 100755
--- a/scripts/upgrade-nix
+++ b/scripts/upgrade-nix
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd "$(dirname ${BASH_SOURCE[0]})/.."
-sudo nix-channel --update
+nix flake update
 sudo scripts/update-nix