diff --git a/pom.xml b/pom.xml
index 888d694d..68cf46f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,11 @@
   </scm>
 
   <repositories>
+      <!-- Repository for zml's stuff -->
+    <repository>
+      <id>zml-repo</id>
+      <url>http://files.zachsthings.com/repo</url>
+    </repository>
     <!-- Repository for other dependencies of SK's -->
     <repository>
       <id>sk89q-mvn2</id>
@@ -49,7 +54,7 @@
     <dependency>
       <groupId>com.sk89q</groupId>
       <artifactId>commandbook</artifactId>
-      <version>1.8-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
     
     <!-- Additional libraries -->
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java
index 45560dab..bb924bc5 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java
@@ -89,7 +89,7 @@ public void run() {
                     .getApplicableRegions(playerLocation);
             
             if (!RegionQueryUtil.isInvincible(plugin, player, applicable)
-                    && !RegionQueryUtil.hasGodMode(player, plugin)
+                    && !plugin.getGlobalStateManager().hasGodMode(player)
                     && !(player.getGameMode() == GameMode.CREATIVE)) {
                 processHeal(applicable, player, state);
                 processFeed(applicable, player, state);
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java
index 91df5a86..f2b522da 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java
@@ -82,18 +82,4 @@ public static Boolean isAllowedInvinciblity(WorldGuardPlugin plugin, Player play
             return null;
         }
     }
-    
-    public static boolean hasGodMode(Player player, WorldGuardPlugin plugin) {
-        try {
-            if (plugin.getServer().getPluginManager().isPluginEnabled("CommandBook")) {
-                GodComponent god = CommandBook.inst().getComponentManager().getComponent(GodComponent.class);
-                if (god != null) {
-                    return god.hasGodMode(player);
-                }
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-        return false;
-    }
 }