diff --git a/flake.nix b/flake.nix
index c1118ea..61038f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,21 +12,21 @@
 
     eachSystem = lib.genAttrs (import systems);
   in {
-    packages = eachSystem (system: let pkgs = import nixpkgs { inherit system; }; in rec {
+    packages = eachSystem (system: let pkgs = import nixpkgs { inherit system; }; in {
       inherit (self.overlays.github2forgejo pkgs pkgs) github2forgejo;
 
-      default = github2forgejo;
+      default = self.packages.${system}.github2forgejo;
     });
 
-    overlays = rec {
-      default        = github2forgejo;
-      github2forgejo = (final: super: {
-        github2forgejo = super.callPackage ./package.nix {};
+    overlays =  {
+      default        = self.overlays.github2forgejo;
+      github2forgejo = (final: _super: {
+        github2forgejo = final.callPackage ./package.nix {};
       });
     };
 
-    nixosModules = rec {
-      default        = github2forgejo;
+    nixosModules = {
+      default        = self.nixosModules.github2forgejo;
       github2forgejo = { config, utils, lib, pkgs, ... }: let
         cfg = config.services.github2forgejo;
       in {
diff --git a/package.nix b/package.nix
index 4db370e..85c03ee 100644
--- a/package.nix
+++ b/package.nix
@@ -32,16 +32,15 @@ stdenvNoCC.mkDerivation {
     runHook preFixup
 
     substituteInPlace $out/bin/github2forgejo \
-      --replace '/usr/bin/env nu' '${nushell}/bin/nu'
+      --replace '/usr/bin/env nu' '${lib.getExe nushell}'
 
     runHook postFixup
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GitHub to Forgejo migration script";
     homepage    = "https://git.rgbcu.be/RGBCube/GitHub2Forgejo";
-    license     = licenses.gpl3Only;
+    license     = lib.licenses.gpl3Only;
     mainProgram = "github2forgejo";
-    maintainers = with maintainers; [ RGBCube ];
   };
 }