diff --git a/foundation/flake.lock b/foundation/flake.lock
index 6592f75..61fb84b 100644
--- a/foundation/flake.lock
+++ b/foundation/flake.lock
@@ -3,10 +3,10 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "f24f0876a9103c7adb8120ce9709fb90c73f2a7c-dirty",
-        "dirtyShortRev": "f24f087-dirty",
-        "lastModified": 1718105966,
-        "narHash": "sha256-L68G29+bPmwZSERg3VYXdfont/w+mssmWnrs6tyBijk=",
+        "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
+        "dirtyShortRev": "9c29945-dirty",
+        "lastModified": 1718255029,
+        "narHash": "sha256-DtCLqQJ1Aa3WTrZcfZyVEa5uGZeYh+7YuqT44K166Cg=",
         "type": "git",
         "url": "file:../?dir=lib"
       },
diff --git a/foundation/flake.nix b/foundation/flake.nix
index d2bcde4..f91665f 100644
--- a/foundation/flake.nix
+++ b/foundation/flake.nix
@@ -7,34 +7,33 @@
     };
   };
 
-  outputs = inputs: let
-    inherit (inputs.lib) lib;
+  outputs =
+    inputs:
+    let
+      inherit (inputs.lib) lib;
 
-    modules = import ./src;
+      modules = import ./src;
 
-    forEachSystem = lib.attrs.generate [
-      "i686-linux"
-    ];
-  in {
-    extras = let
-      result = lib.modules.run {
-        modules =
-          builtins.attrValues modules;
-      };
+      forEachSystem = lib.attrs.generate [
+        "i686-linux"
+        "x86_64-linux"
+      ];
     in
-      result.config.exports.resolved.extras;
+    {
+      extras =
+        let
+          result = lib.modules.run { modules = builtins.attrValues modules; };
+        in
+        result.config.exports.resolved.extras;
 
-    packages = forEachSystem (
-      system: let
-        result = lib.modules.run {
-          modules =
-            (builtins.attrValues modules)
-            ++ [
-              {config.aux.system = system;}
-            ];
-        };
-      in
+      packages = forEachSystem (
+        system:
+        let
+          result = lib.modules.run {
+            modules = (builtins.attrValues modules) ++ [ { config.aux.system = system; } ];
+          };
+        in
         result.config.exports.resolved.packages
-    );
-  };
+      );
+    };
 }
diff --git a/potluck/default.nix b/potluck/default.nix
index c9dfa6b..e07fdbe 100644
--- a/potluck/default.nix
+++ b/potluck/default.nix
@@ -1,30 +1,30 @@
 {
   lib ? import ./../lib,
-  foundation ? import ./../foundation {system = "i686-linux";},
-}: let
+  system ? builtins.currentSystem,
+  foundation ? import ./../foundation { inherit system; },
+}:
+let
   modules = import ./src/modules.nix;
 
   result = lib.modules.run {
-    modules =
-      (builtins.attrValues modules)
-      ++ [
-        ./src/export.nix
-        {
-          __file__ = ./default.nix;
+    modules = (builtins.attrValues modules) ++ [
+      ./src/export.nix
+      {
+        __file__ = ./default.nix;
 
-          options.packages.aux = {
-            foundation = lib.options.create {
-              type = lib.types.attrs.of lib.types.package;
-              internal = true;
-              description = "The foundational packages used to construct the larger package set.";
-            };
+        options.packages.aux = {
+          foundation = lib.options.create {
+            type = lib.types.attrs.of lib.types.package;
+            internal = true;
+            description = "The foundational packages used to construct the larger package set.";
           };
+        };
 
-          config.packages.aux = {
-            foundation = foundation;
-          };
-        }
-      ];
+        config.packages.aux = {
+          inherit foundation;
+        };
+      }
+    ];
   };
 in
-  result.config.exported
+result.config.exported
diff --git a/potluck/flake.lock b/potluck/flake.lock
index 44909b5..9f1c811 100644
--- a/potluck/flake.lock
+++ b/potluck/flake.lock
@@ -8,10 +8,10 @@
       },
       "locked": {
         "dir": "foundation",
-        "dirtyRev": "cd12786be17a611976b44fbba3e245eca512535f-dirty",
-        "dirtyShortRev": "cd12786-dirty",
-        "lastModified": 1718199069,
-        "narHash": "sha256-H2Mkyp9BPDPte+E++uIG2N/vGtcS3H9Q7tM3fOOEXT0=",
+        "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
+        "dirtyShortRev": "9c29945-dirty",
+        "lastModified": 1718255029,
+        "narHash": "sha256-O+UzIjpab9YUwFACx+pi7tqO4HEtjr70ySGKKteURVw=",
         "type": "git",
         "url": "file:../?dir=foundation"
       },
@@ -24,10 +24,10 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "cd12786be17a611976b44fbba3e245eca512535f-dirty",
-        "dirtyShortRev": "cd12786-dirty",
-        "lastModified": 1718199069,
-        "narHash": "sha256-H2Mkyp9BPDPte+E++uIG2N/vGtcS3H9Q7tM3fOOEXT0=",
+        "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
+        "dirtyShortRev": "9c29945-dirty",
+        "lastModified": 1718255029,
+        "narHash": "sha256-O+UzIjpab9YUwFACx+pi7tqO4HEtjr70ySGKKteURVw=",
         "type": "git",
         "url": "file:../?dir=lib"
       },
diff --git a/potluck/flake.nix b/potluck/flake.nix
index e98c783..b09a4ec 100644
--- a/potluck/flake.nix
+++ b/potluck/flake.nix
@@ -9,11 +9,20 @@
     };
   };
 
-  outputs = inputs: let
-    exports = import ./default.nix {
-      lib = inputs.lib.lib;
-      foundation = inputs.foundation.packages.i686-linux;
-    };
-  in
+  outputs =
+    inputs:
+    let
+      inherit (inputs.lib) lib;
+
+      forEachSystem = lib.attrs.generate [
+        "i686-linux"
+        "x86_64-linux"
+      ];
+
+      exports = import ./default.nix {
+        inherit lib;
+        foundation = forEachSystem (system: inputs.foundation.packages.${system});
+      };
+    in
     exports;
 }