diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bb60e7..d01e22d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 ### Added
+- Add nix packaging support ([#88](https://github.com/MechanicalFlower/Marble/pull/88))
 ### Changed
 - Correctly end the race if all marble are not exploded ([#57](https://github.com/MechanicalFlower/Marble/pull/57))
 ### Deprecated
diff --git a/default.nix b/default.nix
index 8201ba8..3a39945 100644
--- a/default.nix
+++ b/default.nix
@@ -22,7 +22,7 @@
   addons = let
     sources = builtins.fromJSON (pkgs.lib.strings.fileContents ./.godot-deps.json);
   in
-    builtins.map(u: pkgs.godotpkgs.mkPlug {
+    builtins.map(u: pkgs.mkPlug {
       inherit (u) owner repo hash;
       rev = u.commit;
     }) sources.addons;
diff --git a/flake.lock b/flake.lock
index 75d1bb9..29a8bed 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,7 +21,9 @@
     "godot": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -40,22 +42,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1735669367,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1736916166,
         "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
@@ -74,7 +60,7 @@
     "root": {
       "inputs": {
         "godot": "godot",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 63abbea..18b5578 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     godot.url = "github:florianvazelle/godot-overlay/rework";
+    godot.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {