Get correct address id for shipping

Fixes bug in shipping address id.  Users were able to checkout with either a null id for shipping or the billing id as shipping id.