diff --git a/modules/nix-common/default.nix b/modules/nix-common/default.nix
index 9956ead..f8d145f 100644
--- a/modules/nix-common/default.nix
+++ b/modules/nix-common/default.nix
@@ -29,9 +29,6 @@ in
 
     nix = {
       package = pkgs.nixVersions.unstable;
-      extraOptions = ''
-        experimental-features = nix-command flakes
-      '';
 
       buildMachines = mkIf cfg.remote-builders [
         {
@@ -52,12 +49,19 @@ in
           "https://nix-community.cachix.org"
           "https://marcus7070.cachix.org"
           "https://devenv.cachix.org"
+          "https://elixir-tools.cachix.org"
         ];
 
         trusted-public-keys = [
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
           "marcus7070.cachix.org-1:JawxHSgnYsgNYJmNqZwvLjI4NcOwrcEZDToWlT3WwXw="
           "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
+          "elixir-tools.cachix.org-1:GfK9E139Ysi+YWeS1oNN9OaTfQjqpLwlBaz+/73tBjU="
+        ];
+        experimental-features = [
+          "nix-command"
+          "flakes"
+          "auto-allocate-uids"
         ];
       };