Baptism is an ordinance and object of obedience, but not a needed part of/for salvation.
Absolutely correct, my friend. To wit, the thief on the cross next to Jesus didn't get taken off the cross and get baptized when he asked Jesus to remember him when He entered His kingdom.
And Jesus promised him that on that day, he would be with Him.