OK, I found the X48 connection, which is really just a a few wire nuts taped together. I cut them and rewired. I now have power to the pump via the flat connector! The trunk lock works for both lock and unlock. The drivers and passenger doors don't work for anything. I guess I need to pull the panels and evaluate the locks to see if they are getting power or if the wire is broken somewhere between X30 and the locks.

Thanks for the help.

G