diff --git a/modules/ai/siren-chatgpt-shell.el b/modules/ai/siren-chatgpt-shell.el
index d2c1f03..9408ece 100644
--- a/modules/ai/siren-chatgpt-shell.el
+++ b/modules/ai/siren-chatgpt-shell.el
@@ -8,8 +8,14 @@
 
 (require 'siren-chatgpt)
 
+(use-package shell-maker
+  :straight (:host github :repo "xenodium/chatgpt-shell"
+                   :files ("shell-maker.el"))
+  :defer t)
+
 (use-package chatgpt-shell
-  :straight (:host github :repo "xenodium/chatgpt-shell")
+  :straight (:host github :repo "xenodium/chatgpt-shell"
+                   :files ("chatgpt-shell.el" "*-chatgpt-shell.el"))
   :defer t
 
   :custom
@@ -19,14 +25,24 @@
   :config
   ;; Set and manage API Key and Model via `siren-chatgpt' helpers.
   (siren-chatgpt-register-api-key-var 'chatgpt-shell-openai-key)
-  (siren-chatgpt-register-api-key-var 'dall-e-shell-openai-key)
   (siren-chatgpt-register-model-var 'chatgpt-shell-model-version)
 
-  (require 'ob-chatgpt-shell)
-  (ob-chatgpt-shell-setup)
+  ;; (require 'ob-chatgpt-shell)
+  ;; (ob-chatgpt-shell-setup)
+  )
 
-  (require 'ob-dall-e-shell)
-  (ob-dall-e-shell-setup))
+(use-package dall-e-shell
+  :straight (:host github :repo "xenodium/chatgpt-shell"
+                   :files ("dall-e-shell.el" "*-dall-e-shell.el"))
+  :defer t
+
+  :config
+  ;; Set and manage API Key and Model via `siren-chatgpt' helpers.
+  (siren-chatgpt-register-api-key-var 'dall-e-shell-openai-key)
+
+  ;; (require 'ob-dall-e-shell)
+  ;; (ob-dall-e-shell-setup)
+  )
 
 (provide 'siren-chatgpt-shell)
 ;;; siren-chatgpt-shell.el ends here
diff --git a/modules/ai/siren-chatgpt.el b/modules/ai/siren-chatgpt.el
index 223af7d..ef8d616 100644
--- a/modules/ai/siren-chatgpt.el
+++ b/modules/ai/siren-chatgpt.el
@@ -74,9 +74,8 @@ their model settings are kept in sync with `siren-chatgpt-model'.")
   "Return the login name of the current user.
 
 Used to allow different API keys for different models."
-  (if (string-prefix-p "gpt-4" siren-chatgpt-model)
-      "gpt-4"
-    "default"))
+  (cond ((string-prefix-p "gpt-4" siren-chatgpt-model) "gpt-4")
+        (t "default")))
 
 (defun siren-chatgpt-select-model ()
   "Select a model to use for chatgpt."