Ack! Function Arguments in Wrong Order

This changes from get by type to get by id -- which is what we want :)

This is also why I want to change something; I just don't know what...
This is too error prone!

Change-Id: Id574fad0f00147b6a8a2653c871c799367be858b