diff --git a/fasttoggle.module b/fasttoggle.module
index d1d3465..5e950ad 100644
--- a/fasttoggle.module
+++ b/fasttoggle.module
@@ -157,14 +157,14 @@ function fasttoggle($option_info, $group, $instance, $object, $format, $view = N
 
   if (empty($option_info['fields']['callback_fn'])) {
     $view = is_null($view) ? '' : "/{$view}";
-    $callback = "fasttoggle/{$option_info['object_type']}/{$object->$option_info['id_field']}/{$group}/{$instance}{$view}";
+    $callback = "fasttoggle/{$option_info['object_type']}/{$object->{$option_info['id_field']}}/{$group}/{$instance}{$view}";
   }
   else {
     $callback = $option_info['fields']['callback_fn']($option_info, $group, $instance, $object, $view);
   }
 
-  $token = $group . '_' . $instance . '_' . $object->$option_info['id_field'];
-  $selector_class = 'fasttoggle-status-' . $option_info['object_type'] . '-' . $object->$option_info['id_field'] . '-' . $group . '-' . $instance;
+  $token = $group . '_' . $instance . '_' . $object->{$option_info['id_field']};
+  $selector_class = 'fasttoggle-status-' . $option_info['object_type'] . '-' . $object->{$option_info['id_field']} . '-' . $group . '-' . $instance;
   $status_class = 'fasttoggle-status-' . $option_info['object_type'] . '-' . $group . '-' . $instance . '-' . $current_value;
 
   // Only include the support files once.
@@ -328,7 +328,7 @@ function fasttoggle_get_allowed_links($type, $obj = NULL, $object_id = 0, $setti
           // More localised settings
           $sub_type = isset($obj) && isset($filtering['subtype_field']) ? $obj->{$filtering['subtype_field']} : "";
           // For nodes, the setter adds the node type so we need to do so too when getting only.
-          $setting_key = isset($setting_prefix) ? "{$setting_prefix}_{$type}_{$obj->$filtering['subtype_field']}" : "fasttoggle_{$type}_{$group_name}_settings";
+          $setting_key = isset($setting_prefix) ? "{$setting_prefix}_{$type}_{$obj->{$filtering['subtype_field']}}" : "fasttoggle_{$type}_{$group_name}_settings";
           $current_values = array_filter(variable_get($setting_key, $defaults));
 
           // Some forms (node_type_admin...) do array_keys on the values saved.