diff --git a/modules/development.nix b/modules/development.nix
index 52db4c7..9175bcc 100644
--- a/modules/development.nix
+++ b/modules/development.nix
@@ -2,7 +2,7 @@
 
 {
   # Improve nix-shell and direnv integration
-  environment.pathsToLink = [ "/share/nix-direnv" ];
+  services.lorri.enable = true;
 
   # Enable virtualisation
   virtualisation.libvirtd = {
diff --git a/modules/software.nix b/modules/software.nix
index 1489fa9..25a5a12 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -32,7 +32,7 @@
     # Development
     git
     direnv
-    nix-direnv
+    lorri
     podman-compose
     gnumake
     gitAndTools.pre-commit