diff --git a/hosts/server/default.nix b/hosts/server/default.nix
index 4d19106..b6ce044 100644
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -179,7 +179,6 @@ in {
 
   environment.systemPackages = with pkgs; [
     python-with-my-packages
-    alejandra
     aspell
     aspellDicts.en
     base16-schemes
@@ -198,6 +197,7 @@ in {
     lsb-release
     lsof
     nix-bash-completions
+    nixfmt
     pkg-config
     poppler_utils
     ruby
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index 531ac0b..cedf70e 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -263,7 +263,6 @@ in {
   environment.systemPackages = with pkgs; [
     python-with-my-packages
     acpi
-    alejandra
     aspell
     aspellDicts.en
     base16-schemes
@@ -290,6 +289,7 @@ in {
     lsof
     nix-bash-completions
     nixd
+    nixfmt
     pkg-config
     playerctl
     poppler_utils
diff --git a/justfile b/justfile
index 098579a..9d281c8 100644
--- a/justfile
+++ b/justfile
@@ -2,7 +2,7 @@ HOSTNAME  := `hostname -s`
 
 # Do as test build without installing
 test hostname=(HOSTNAME):
-  @alejandra . &> nixos-switch.log || ( cat nixos-switch.log && false)
+  @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false)
   @rm -f nixos-switch.log
   @colmena --impure build --on {{hostname}}
 
@@ -33,7 +33,7 @@ web:
 
 # Build and run a vm FIXME
 vm:
-  @alejandra . &> nixos-switch.log || ( cat nixos-switch.log && false)
+  @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false)
   @rm -f nixos-switch.log
   @echo Running iso build
   @nix build --impure ./#nixosConfigurations.vm.config.system.build.isoImage &> nixos-switch.log || ( grep -E --color '(error|For full logs)' nixos-switch.log && false)