diff --git a/machines/moritz-server/configuration.nix b/machines/moritz-server/configuration.nix
index 57a1055..ef26b4d 100644
--- a/machines/moritz-server/configuration.nix
+++ b/machines/moritz-server/configuration.nix
@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   imports = [
     ../../modules/zfs_unencrypted.nix
     ../../modules/shared.nix
@@ -15,6 +15,7 @@
   # If you change the hostname, you need to update this line to root@<new-hostname>
   # This only works however if you have avahi running on your admin machine else use IP
   clan.core.networking.targetHost = "root@moritz-server";
+  nix.package = pkgs.lixPackageSets.latest.lix;
 
   networking = {
     interfaces.enp2s0 = {
diff --git a/modules/moritz/programs/nix.nix b/modules/moritz/programs/nix.nix
index d00dfd1..15b4c20 100644
--- a/modules/moritz/programs/nix.nix
+++ b/modules/moritz/programs/nix.nix
@@ -30,7 +30,7 @@ in {
     nix = {
       nixPath = ["nixpkgs=${inputs.nixpkgs}"];
 
-      package = pkgs.nix; # TODO: change this back
+      package = pkgs.lixPackageSets.latest.lix;
 
       extraOptions = ''
         experimental-features = nix-command flakes