diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index c7f21bc..82d4095 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -141,10 +141,6 @@ MODE1 is enabled and vice-versa."
   "Set the `disabled' property for each item in FUNCTIONS to nil."
   (mapc #'(lambda (f) (put f 'disabled nil)) functions))
 
-(defun oni:reset-default-directory ()
-  "Reset `default-directory' to HOME."
-  (setq default-directory (getenv "HOME")))
-
 (defun oni:scroll-down-or-prev-page (arg)
   "Either scroll down or go to the previous page.
 
@@ -834,7 +830,7 @@ If no direction is given, don't split."
 
 (oni:add-hooks 'jabber-chat-mode-hook
   #'oni:set-keys-for-jabber-chat 'oni:make-readable
-  #'oni:reset-default-directory)
+  'oni:reset-default-directory)
 
 (oni:add-hooks 'js2-mode-hook
   #'tern-mode #'moz-minor-mode)
diff --git a/emacs/.emacs.d/site-lisp/oni-env.el b/emacs/.emacs.d/site-lisp/oni-env.el
new file mode 100644
index 0000000..1fcd021
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-env.el
@@ -0,0 +1,33 @@
+;;; oni-env.el --- Environment-related commands and functions  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2015  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Here are some environment-related commands and functions.
+
+;;; Code:
+
+;;;###autoload
+(defun oni:reset-default-directory ()
+  "Reset `default-directory' to HOME."
+  (setq default-directory (getenv "HOME")))
+
+(provide 'oni-env)
+;;; oni-env.el ends here