diff --git a/modules/core/nix.nix b/modules/core/nix.nix
index 711304b..325e20c 100644
--- a/modules/core/nix.nix
+++ b/modules/core/nix.nix
@@ -21,7 +21,7 @@
       system-features = ["nixos-test" "benchmark" "big-parallel" "kvm"];
     };
     # Generally useful nix option defaults
-    extraOptions = ''
+    extraOptions = lib.mkForce ''
       min-free = 536870912
       keep-outputs = true
       keep-derivations = true
diff --git a/profiles/cachix/default.nix b/profiles/cachix/default.nix
deleted file mode 100644
index 9b810da..0000000
--- a/profiles/cachix/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  folder = ./.;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.settings.substituters = ["https://cache.nixos.org/"];
-}
diff --git a/profiles/full-install/default.nix b/profiles/full-install/default.nix
index d3c03da..d9b0773 100644
--- a/profiles/full-install/default.nix
+++ b/profiles/full-install/default.nix
@@ -7,8 +7,6 @@
 }: let
   inherit (lib) fileContents;
 in {
-  imports = [../cachix];
-
   config = {
     pub-solar.audio.mopidy.enable = true;
     pub-solar.audio.bluetooth.enable = true;
diff --git a/profiles/pub-solar-iso/default.nix b/profiles/pub-solar-iso/default.nix
index 2b3669c..fa97328 100644
--- a/profiles/pub-solar-iso/default.nix
+++ b/profiles/pub-solar-iso/default.nix
@@ -7,7 +7,6 @@
 }: let
   inherit (lib) fileContents;
 in {
-  imports = [../cachix];
   config = {
     pub-solar.graphical.wayland.software-renderer.enable = true;
     pub-solar.sway.terminal = "foot";