diff --git a/flake.nix b/flake.nix
index f7a60dd..5fd83f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -108,13 +108,6 @@
       allowUnfree = true;
     };
 
-    # Helper to create source metadata
-    mkSource = src: {
-      inherit src;
-      version = src.shortRev or src.rev or "unknown";
-      date = src.lastModifiedDate or "unknown";
-    };
-
     mkNixosSystem = {
       hostname,
       system,
@@ -142,13 +135,13 @@
                   niri.overlays.niri
                   noctalia.overlays.default
                   nur.overlays.default
-                  (import ./packages/overlay.nix)
                   (final: prev: {
-                    openmw-git = mkSource openmw;
-                    catppuccin-discord-git = mkSource catppuccin-discord;
-                    catppuccin-btop-git = mkSource catppuccin-btop;
-                    catppuccin-mpv-git = mkSource catppuccin-mpv;
+                    openmw-git = openmw;
+                    catppuccin-discord-git = catppuccin-discord;
+                    catppuccin-btop-git = catppuccin-btop;
+                    catppuccin-mpv-git = catppuccin-mpv;
                   })
+                  (import ./packages/overlay.nix)
                 ];
               };
               nix = {
diff --git a/home/graphical/mpv/default.nix b/home/graphical/mpv/default.nix
index 3a3a1d6..1ba31d4 100644
--- a/home/graphical/mpv/default.nix
+++ b/home/graphical/mpv/default.nix
@@ -6,7 +6,7 @@
   mergedConfig = pkgs.runCommand "mergedConfig" {} ''
     mkdir -p $out
     ${pkgs.gnused}/bin/sed 's/#1e1e2e/#000000/g' \
-      ${pkgs.catppuccin-mpv-git.src}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
+      ${pkgs.catppuccin-mpv-git}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
       > $out/mpv.conf
   '';
 in {
diff --git a/home/terminal/btop/default.nix b/home/terminal/btop/default.nix
index a8f337a..52f8e03 100644
--- a/home/terminal/btop/default.nix
+++ b/home/terminal/btop/default.nix
@@ -7,8 +7,8 @@
     mkdir -p $out/themes
     ${pkgs.gnused}/bin/sed 's/blankFlavor/${config.catppuccin.flavor}/g' \
       ${./btop.conf} > $out/btop.conf
-    cp ${pkgs.catppuccin-btop-git.src}/themes/catppuccin_latte.theme $out/themes/
-    cp ${pkgs.catppuccin-btop-git.src}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/nixos.theme
+    cp ${pkgs.catppuccin-btop-git}/themes/catppuccin_latte.theme $out/themes/
+    cp ${pkgs.catppuccin-btop-git}/themes/catppuccin_${config.catppuccin.flavor}.theme $out/themes/nixos.theme
   '';
 in {
   home.file.".config/btop" = {
diff --git a/packages/catppuccin-discord/default.nix b/packages/catppuccin-discord/default.nix
index c672ab1..556cd53 100644
--- a/packages/catppuccin-discord/default.nix
+++ b/packages/catppuccin-discord/default.nix
@@ -10,9 +10,9 @@
 }:
 stdenv.mkDerivation rec {
   pname = "catppuccin-discord";
-  version = "unstable-${catppuccin-discord-git.date}-${catppuccin-discord-git.version}";
+  version = "unstable-${catppuccin-discord-git.rev}";
 
-  src = catppuccin-discord-git.src;
+  src = catppuccin-discord-git;
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
diff --git a/packages/openmw/default.nix b/packages/openmw/default.nix
index 13e5da9..850c9bc 100644
--- a/packages/openmw/default.nix
+++ b/packages/openmw/default.nix
@@ -3,6 +3,7 @@
   openmw-git,
 }:
 openmw.overrideAttrs (oldAttrs: {
-  version = "unstable-${openmw-git.date}-${openmw-git.version}";
-  src = openmw-git.src;
+  pname = "openmw-unstable";
+  version = "unstable-${openmw-git.rev}";
+  src = openmw-git;
 })