diff --git a/options/emacs-init-defaults.nix b/options/emacs-init-defaults.nix
index e28b1c2..261cd09 100644
--- a/options/emacs-init-defaults.nix
+++ b/options/emacs-init-defaults.nix
@@ -46,30 +46,12 @@
       '';
     };
 
-    lsp-rust = {
-      config = ''
-        (setq lsp-rust-rls-server-command "${pkgs.rls}/bin/rls")
-      '';
-    };
-
-    ob-plantuml = {
-      config = ''
-        (setq org-plantuml-jar-path "${pkgs.plantuml}/lib/plantuml.jar")
-      '';
-    };
-
     pandoc-mode = {
       config = ''
         (setq pandoc-binary "${pkgs.pandoc}/bin/pandoc")
       '';
     };
 
-    plantuml-mode = {
-      config = ''
-        (setq plantuml-jar-path "${pkgs.plantuml}/lib/plantuml.jar")
-      '';
-    };
-
     ripgrep = {
       config = ''
         (setq ripgrep-executable "${pkgs.ripgrep}/bin/rg")
diff --git a/pkgs/pkgsets/emacs/flyspell.nix b/pkgs/pkgsets/emacs/flyspell.nix
index 70c1e53..91ec658 100644
--- a/pkgs/pkgsets/emacs/flyspell.nix
+++ b/pkgs/pkgsets/emacs/flyspell.nix
@@ -5,6 +5,7 @@ with lib;
 mkIf (elem "emacs::flyspell" config.machine.pkgs) {
   programs.emacs.init.usePackage.flyspell = {
     enable = true;
+    package = epkgs: null;
     diminish = [ "flyspell-mode" ];
     command = [ "flyspell-mode" "flyspell-prog-mode" ];
     hook = [];
diff --git a/pkgs/pkgsets/emacs/org.nix b/pkgs/pkgsets/emacs/org.nix
index 557d46e..d426c88 100644
--- a/pkgs/pkgsets/emacs/org.nix
+++ b/pkgs/pkgsets/emacs/org.nix
@@ -185,6 +185,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
 
   programs.emacs.init.usePackage.ob = {
     enable = true;
+    package = epkgs: [ epkgs.ob-ipython epkgs.ob-rust epkgs.ob-diagrams ];
     defer = true;
     init = ''
       (add-hook 'org-babel-after-execute-hook 'org-display-inline-images 'append)
@@ -307,6 +308,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
 
   programs.emacs.init.usePackage.org-src = {
     enable = true;
+    package = epkgs: null;
     defer = true;
     init = ''(put 'org-src-preserve-indentation 'safe-local-variable 'booleanp)'';
     config = ''
@@ -359,10 +361,12 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
 
   programs.emacs.init.usePackage.org-tempo = {
     enable = true;
+    package = null;
   };
 
   programs.emacs.init.usePackage.ox = {
     enable = true;
+    package = null;
     defer = true;
     command = [];
     config = ''
@@ -388,6 +392,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
 
   programs.emacs.init.usePackage.ox-md = {
     enable = true;
+    package = null;
     after = [ "ox" ];
   };
 
@@ -398,6 +403,7 @@ mkIf (elem "emacs::org" config.machine.pkgs) {
 
   programs.emacs.init.usePackage.org-crypt = {
     enable = true;
+    package = epkgs: null;
     after = [ "org" ];
     hook = [ "(org-mode . (lambda () (add-hook 'before-save-hook 'org-encrypt-entries nil t)))" ];
     command = [ "org-decrypt-entry" "org-encrypt-entry" ];