diff --git a/configuration.nix b/configuration.nix
index 053e5e3..5d113b3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -41,6 +41,7 @@
     };
     extraOptions = ''
       keep-outputs = true
+      keep-derivations = true
       gc-keep-outputs = true
     '';
   };
diff --git a/modules/development.nix b/modules/development.nix
index 9175bcc..52db4c7 100644
--- a/modules/development.nix
+++ b/modules/development.nix
@@ -2,7 +2,7 @@
 
 {
   # Improve nix-shell and direnv integration
-  services.lorri.enable = true;
+  environment.pathsToLink = [ "/share/nix-direnv" ];
 
   # Enable virtualisation
   virtualisation.libvirtd = {
diff --git a/modules/software.nix b/modules/software.nix
index 195eded..c1854b5 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -32,7 +32,7 @@
     # Development
     git
     direnv
-    lorri
+    nix-direnv
     podman-compose
     gnumake
     gitAndTools.pre-commit