diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..50510bf
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,7 @@
+(import (
+  fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/12c64ca55c1014cdc1b16ed5a804aa8576601ff2.tar.gz";
+    sha256 = "0jm6nzb83wa6ai17ly9fzpqc40wg1viib8klq8lby54agpl213w5"; }
+) {
+  src =  ./.;
+}).defaultNix
diff --git a/flake.nix b/flake.nix
index fc2b26c..4c14c7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,37 +9,46 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = {nixpkgs, nixpkgs-unstable, home-manager, ... }: let 
+  outputs = { self, home-manager, nixpkgs, nixpkgs-unstable, ... }@inputs: let 
     system = "x86_64-linux";
 
-    unstable = nixpkgs-unstable.legacyPackages.${system};
-
-    lauren_lagarde_modules = [{
-      home.username = "lauren_lagarde";
-      home.homeDirectory = "/home/lauren_lagarde";
-    }];
+    pkgs = import nixpkgs { inherit system; };
+    pkgs-unstable = import nixpkgs-unstable { inherit system; };
   in {
+    # Enables all of these be used in a system flake
+    # https://discourse.nixos.org/t/nixos-home-manager-config-where-both-use-flakes/41410/2
+    homeManagerModules = {
+      #inherit pkgs-unstable; #TODO: ????
+
+      "lauren_lagarde" = [
+        {
+          home.username = "lauren_lagarde";
+          home.homeDirectory = "/home/lauren_lagarde";
+        }
+        ./base.nix
+      ];
+
+      "lauren_lagarde@ll-latitude-e5591" = self.homeManagerModules."lauren_lagarde" ++ [
+        ./i3.nix
+
+        ./secrets/dotspace.nix
+        ./secrets/dotspace_gui.nix
+
+        ./systems/ll-latitude-e5591.nix
+      ];
+    };
+
     homeConfigurations = {
       "lauren_lagarde" = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs { system = "x86_64-linux"; };
-        modules = lauren_lagarde_modules ++ [
-          ./base.nix
-        ];
+        inherit pkgs;
+        modules = self.homeManagerModules."lauren_lagarde";
+        extraSpecialArgs = { inherit inputs pkgs-unstable; };
       };
 
       "lauren_lagarde@ll-latitude-e5591" = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs { system = "x86_64-linux"; };
-        modules = lauren_lagarde_modules ++ [
-          ./base.nix
-
-          ./i3.nix
-
-          ./secrets/dotspace.nix
-          ./secrets/dotspace_gui.nix
-
-          ./systems/ll-latitude-e5591.nix
-        ];
-        extraSpecialArgs = { unstable = unstable; };
+        inherit pkgs;
+        modules = self.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
+        extraSpecialArgs = { inherit inputs pkgs-unstable; };
       };
     };
   };
diff --git a/programs/firefox.nix b/programs/firefox.nix
index 74fbbd9..b697382 100644
--- a/programs/firefox.nix
+++ b/programs/firefox.nix
@@ -1,7 +1,8 @@
-{ unstable, ... }: {
+#{ pkgs-unstable, ... }: {
+{ ... }: {
   programs.firefox = {
     enable = true;
-    package = unstable.pkgs.firefox;
+    #package = pkgs-unstable.firefox;
     policies = {
       DisableTelemetry = false;
       DisablePocket = true;
diff --git a/secrets.tar.zst.gpg b/secrets.tar.zst.gpg
index 04fd043..72305ae 100644
Binary files a/secrets.tar.zst.gpg and b/secrets.tar.zst.gpg differ
diff --git a/systems/ll-latitude-e5591.nix b/systems/ll-latitude-e5591.nix
index 95fb797..5fdc506 100644
--- a/systems/ll-latitude-e5591.nix
+++ b/systems/ll-latitude-e5591.nix
@@ -1,4 +1,5 @@
-{ pkgs, unstable, ... }: {
+#{ pkgs, pkgs-unstable, ... }: {
+{ pkgs, ... }: {
   nixpkgs.config.allowUnfree = true;
 
   home.packages = with pkgs; [
@@ -31,8 +32,12 @@
     # Other Apps
     chromium
     qtpass
-    unstable.yt-dlp
-    unstable.openscad-unstable
+
+    #pkgs-unstable.yt-dlp
+    #pkgs-unstable.openscad-unstable
+    yt-dlp
+    openscad-unstable
+
     sublime-merge
     libreoffice
     gthumb