Removed custom id code

No longer make returning the underlying private key optional.  Updated all calls for linked object to OQL style to be more reliable and use a key lookup instead of other attributes.