diff --git a/flake.lock b/flake.lock
index f4d237c..43ed266 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,27 +42,27 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1716006448,
-        "narHash": "sha256-IjqkCdRLwQtGtxTdgm8oZcUyi71PPCK0QNFVpamth5E=",
+        "lastModified": 1718588737,
+        "narHash": "sha256-06acqoMEYtc+/w5gWiIIuUFfdtdOBKlp1qrC/InRiBY=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "1b16e4290a5e4a59c75ef53617d597e02078791e",
+        "rev": "b0a2376f6c164a0af963d47386c064cc6fdcd5ea",
         "type": "github"
       },
       "original": {
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "1b16e4290a5e4a59c75ef53617d597e02078791e",
+        "rev": "b0a2376f6c164a0af963d47386c064cc6fdcd5ea",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1717574423,
-        "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=",
+        "lastModified": 1719487696,
+        "narHash": "sha256-pCsl9qFCuIuhIfGH03CiBOsy1LNwITC6VMb6/5tz+Qc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177",
+        "rev": "14aadcba1a26c8c142453839f888afd0db8b2041",
         "type": "github"
       },
       "original": {
@@ -90,16 +90,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717196966,
-        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "lastModified": 1719550049,
+        "narHash": "sha256-5qQ5XKvRZXCycA/G8Y/Cy+UWHr6afMXkzXSzjN9Pe6A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "rev": "ea780bcedbe728b5e7447d3730bcef976b0063cc",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 9519222..c3f41e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,14 @@
   description = "The easy to use mobile and desktop operating system from Midstall Software";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixos-mobile = {
       url = "github:RossComputerGuy/mobile-nixos/fix/impure";
       flake = false;
     };
     nixos-apple-silicon = {
-      url = "github:tpwrules/nixos-apple-silicon/1b16e4290a5e4a59c75ef53617d597e02078791e";
+      url = "github:tpwrules/nixos-apple-silicon/b0a2376f6c164a0af963d47386c064cc6fdcd5ea";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
deleted file mode 100644
index 27868f3..0000000
--- a/pkgs/development/compilers/flutter/default.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv, targetPackages, pkgs }:
-let
-  mkCustomFlutter = args: callPackage "${pkgs.path}/pkgs/development/compilers/flutter/flutter.nix" args;
-  wrapFlutter = flutter: callPackage "${pkgs.path}/pkgs/development/compilers/flutter/wrapper.nix" {
-    inherit flutter;
-    inherit (targetPackages) atk cairo harfbuzz libepoxy pango libdeflate zlib;
-  };
-  getPatches = dir:
-    let files = builtins.attrNames (builtins.readDir dir);
-    in if (builtins.pathExists dir) then map (f: dir + ("/" + f)) files else [ ];
-  mkFlutter =
-    { version
-    , engineVersion
-    , dartVersion
-    , flutterHash
-    , dartHash
-    , patches
-    , pubspecLock
-    , artifactHashes
-    }:
-    let
-      args = {
-        inherit version engineVersion patches pubspecLock artifactHashes;
-
-        dart = dart.override {
-          version = dartVersion;
-          sources = {
-            "${dartVersion}-x86_64-linux" = fetchzip {
-              url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
-              sha256 = dartHash.x86_64-linux;
-            };
-            "${dartVersion}-aarch64-linux" = fetchzip {
-              url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
-              sha256 = dartHash.aarch64-linux;
-            };
-            "${dartVersion}-x86_64-darwin" = fetchzip {
-              url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
-              sha256 = dartHash.x86_64-darwin;
-            };
-            "${dartVersion}-aarch64-darwin" = fetchzip {
-              url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
-              sha256 = dartHash.aarch64-darwin;
-            };
-          };
-        };
-        src = fetchFromGitHub {
-          owner = "flutter";
-          repo = "flutter";
-          rev = version;
-          hash = flutterHash;
-        };
-      };
-    in
-    (mkCustomFlutter args).overrideAttrs (prev: next: {
-      passthru = next.passthru // rec {
-        inherit wrapFlutter mkCustomFlutter mkFlutter;
-        buildFlutterApplication = callPackage ../../../build-support/flutter {
-          flutter = wrapFlutter (mkCustomFlutter args);
-          inherit (targetPackages) glib;
-        };
-      };
-    });
-
-  flutterVersions = lib.mapAttrs'
-    (version: _:
-      let
-        versionDir = "${pkgs.path}/pkgs/development/compilers/flutter/versions/${version}";
-        data = lib.importJSON (versionDir + "/data.json");
-      in
-      lib.nameValuePair "v${version}" (wrapFlutter (mkFlutter ({
-        patches = (getPatches "${pkgs.path}/pkgs/development/compilers/flutter/patches") ++ (getPatches (versionDir + "/patches"));
-      } // data))))
-    (builtins.readDir "${pkgs.path}/pkgs/development/compilers/flutter/versions");
-in
-flutterVersions // {
-  stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames flutterVersions))};
-  inherit wrapFlutter mkFlutter;
-}
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 0847523..b8aea8e 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -1,15 +1,8 @@
-final: prev:
+pkgs: prev: with pkgs;
 rec {
-  flutterPackages = prev.recurseIntoAttrs (prev.callPackage ./development/compilers/flutter {});
-  flutter = flutterPackages.stable;
-  flutter322 = flutterPackages.v3_22;
-  flutter319 = flutterPackages.v3_19;
-  flutter316 = flutterPackages.v3_16;
-  flutter313 = flutterPackages.v3_13;
+  flutterPackages = flutterPackages-source;
 
-  expidus = prev.expidus.override {
-    inherit (final.buildPackages) flutterPackages;
-  } // (final.callPackages ./expidus {
-    inherit (final.buildPackages) flutter;
+  expidus = prev.expidus // (callPackages ./expidus {
+    inherit flutter;
   });
 }