I can make joins more efficient again

[kesne]

We moved to consolidate internal and external IDs, so we can do the efficient organization membership join now (plus probably some others)!