diff --git a/pkgs/default.nix b/pkgs/default.nix
index 55a2aca..95c15d1 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -61,9 +61,4 @@ in
       sha256 = "0mjs3yilf5rixm67wk4h4jji54dsc0w3vfxd561pvfbxplbmgh3c";
     };
   });
-
-  # TODO: remove when flakes support is in nix stable
-  nix-direnv = prev.nix-direnv.override {
-    enableFlakes = true;
-  };
 }
diff --git a/users/simon/modules/zsh.nix b/users/simon/modules/zsh.nix
index f11485f..73993e7 100644
--- a/users/simon/modules/zsh.nix
+++ b/users/simon/modules/zsh.nix
@@ -27,7 +27,10 @@ in
     };
     direnv = {
       enable = true;
-      enableNixDirenvIntegration = true;
+      nix-direnv = {
+        enable = true;
+        enableFlakes = true;
+      };
     };
     starship = {
       enable = true;