diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 6e1a4138..ca6baad0 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -169,8 +169,12 @@ function endModule() {
 
 function require(obj, name, from) {
     try {
+        if (arguments.length === 1)
+            [obj, name] = [{}, obj];
+
         defineModule.loadLog.push((from || "require") + ": loading " + name + " into " + obj.NAME);
         JSMLoader.load(name + ".jsm", obj);
+        return obj;
     }
     catch (e) {
         defineModule.dump("loading " + String.quote(name + ".jsm") + "\n");
diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index d87ea02b..c8eb37c6 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -8,6 +8,7 @@
 
 try {
 
+let global = this;
 Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("config", {
     exports: ["ConfigBase", "Config", "config"],
@@ -54,7 +55,7 @@ var ConfigBase = Class("ConfigBase", {
     addon: Class.memoize(function () {
         let addon = services.fuel.storage.get("dactyl.bootstrap", {}).addon;
         if (!addon)
-            addon = AddonManager.getAddonByID(this.addonID);
+            addon = require("addons").AddonManager.getAddonByID(this.addonID);
         return addon;
     }),